Merge branch 'master' of git://git.denx.de/u-boot-arc
authorTom Rini <[email protected]>
Thu, 5 Jun 2014 15:46:34 +0000 (11:46 -0400)
committerTom Rini <[email protected]>
Thu, 5 Jun 2014 15:46:34 +0000 (11:46 -0400)

Trivial merge